Allow all unused GSI to be configured via IO-APIC by new pv_ops dom0
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 1 Apr 2010 08:55:27 +0000 (09:55 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 1 Apr 2010 08:55:27 +0000 (09:55 +0100)
Currently Xen disallows setting up any GSI < 16. This makes it
impossible by the kernel to use any PCI devices without ACPI override
but a mapping to this interrupts via IO-APIC.

The patch allows all unused interrupts to be setup via IO-APIC.

Signed-off-by: Bastian Blank <waldi@debian.org>
xen/arch/x86/mpparse.c
xen/arch/x86/physdev.c

index 1917862cd38d2cc863e73e28bab976c694c80bda..95aff543f245dd41f1993ef0d7662083469b3cbb 100644 (file)
@@ -1103,6 +1103,7 @@ int mp_register_gsi (u32 gsi, int triggering, int polarity)
        int                     ioapic = -1;
        int                     ioapic_pin = 0;
        int                     idx, bit = 0;
+
        /*
         * Mapping between Global System Interrups, which
         * represent all possible interrupts, and IRQs
@@ -1126,6 +1127,9 @@ int mp_register_gsi (u32 gsi, int triggering, int polarity)
        if (ioapic_renumber_irq)
                gsi = ioapic_renumber_irq(ioapic, gsi);
 
+       if (!(irq_to_desc(gsi)->status & IRQ_DISABLED))
+               return -EEXIST;
+
        /* 
         * Avoid pin reprogramming.  PRTs typically include entries  
         * with redundant pin->gsi mappings (but unique PCI devices);
index b0d777a6e8daa4c3e558e7ca57a35b116b836db6..baaff24ba2fb7d3394754872a21057a073c0ecc2 100644 (file)
@@ -476,12 +476,8 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE(void) arg)
         ret = -EINVAL;
         if ( setup_gsi.gsi < 0 || setup_gsi.gsi >= nr_irqs_gsi )
             break;
-        /* GSI < 16 has been setup by hypervisor */
-        if ( setup_gsi.gsi >= 16 )
-            ret = mp_register_gsi(setup_gsi.gsi, setup_gsi.triggering,
-                            setup_gsi.polarity);
-        else 
-            ret = -EEXIST;
+        ret = mp_register_gsi(setup_gsi.gsi, setup_gsi.triggering,
+                              setup_gsi.polarity);
         break; 
     }
     default: